Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tikv: fix unexpected retry region request when context cancel (#20030) #20031

Merged
merged 3 commits into from
Sep 18, 2020
Merged

tikv: fix unexpected retry region request when context cancel (#20030) #20031

merged 3 commits into from
Sep 18, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #20030 to release-4.0

What problem does this PR solve?

Issue Number: close #20029

What is changed and how it works?

What's Changed: you can check the comments in file change to know what happens.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test

Release note

  • fix unexpected retry region request when context cancel.

@lzmhhh123 @ti-srebot
cherry pick pingcap#20030 to release-4.0
98c9288 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Sep 16, 2020
Merged
@ti-srebot ti-srebot added this to the 4.0.7 milestone Sep 16, 2020
@tiancaiamao
Copy link
Contributor

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 16, 2020
SunRunAway
SunRunAway reviewed Sep 17, 2020
View reviewed changes
Copy link
Contributor

@SunRunAway SunRunAway left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 17, 2020
@SunRunAway
Copy link
Contributor

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 17, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

1 similar comment
@lilinghai
Copy link
Contributor

/run-all-tests

@lysu
Copy link
Contributor

lysu commented Sep 18, 2020

LGTM

@ti-srebot ti-srebot added status/LGT3 The PR has already had 3 LGTM. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Sep 18, 2020
@lysu
Copy link
Contributor

lysu commented Sep 18, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Sorry @lysu, you don't have permission to trigger auto merge event on this branch.

@coocood
Copy link
Member

coocood commented Sep 18, 2020

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit 6d71e24 into pingcap:release-4.0 Sep 18, 2020
@breezewish breezewish deleted the release-4.0-1dcd15648048 branch September 21, 2020 07:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SunRunAway SunRunAway SunRunAway approved these changes

@lysu lysu Awaiting requested review from lysu

@tiancaiamao tiancaiamao Awaiting requested review from tiancaiamao

Assignees

@lzmhhh123 lzmhhh123

Labels
component/tikv status/can-merge Indicates a PR has been approved by a committer. status/LGT3 The PR has already had 3 LGTM. type/bugfix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.7
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @tiancaiamao @SunRunAway @lilinghai @lysu @coocood @lzmhhh123